Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Fri, 2 Apr 2010 09:45:27 +0000 (11:45 +0200)
committerJan D. <jan.h.d@swipnet.se>
Fri, 2 Apr 2010 09:45:27 +0000 (11:45 +0200)

Trivial merge